From: Bernard Cafarelli <voyageur@gentoo.org>
Date: Wed, 21 Jan 2015 14:59:28 +0000 (+0000)
Subject: Fix installation with USE=-doc
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=381919e50ae35828650bb52873751cb1a29fa79a;p=gentoo.git

Fix installation with USE=-doc

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

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 78ae5e40b662..41b5668d3fd9 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.219 2015/01/21 09:26:20 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.220 2015/01/21 14:59:19 voyageur Exp $
+
+  21 Jan 2015; Bernard Cafarelli <voyageur@gentoo.org> llvm-3.5.1.ebuild:
+  Fix installation with USE=-doc
 
 *llvm-3.5.1 (21 Jan 2015)
 
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 133388aa3b32..bc946228d18f 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -72,14 +72,14 @@ EBUILD llvm-3.2.ebuild 6534 SHA256 eb16cc91887fdb035722d268caaa3e4843825403786fc
 EBUILD llvm-3.3-r3.ebuild 14190 SHA256 d16d933d6791ef7dbe08aa43340bb9924e063af11fa9e13ca8230509240d2c15 SHA512 c986e970f489f7ff79188043db397383e3c567735c8f4a1e8a13b89ef6a3a9f4b8550218444eadd04ef3a14143ab05dc839b3dbe935128f5437157d3aaec02cf WHIRLPOOL 910f7d65902548270835371a5076c746534c0b57487fb8fb149a893454e86e942beed284d6b7491cfb2f043a6e19554f97aec829067938192e75f64bd0fd7a7c
 EBUILD llvm-3.4.2.ebuild 15684 SHA256 bf48165569f4e1d74e59315ad96183c2275a4ebd909460e9478ea5ece021da23 SHA512 0885736fb3e33aa6aa76c8f83e9280e66482e4748722f9ebb767e1ca47fa94e00ab2007702c7aa35a36c06103fa41ce00fa3a8123e9adc14bcc0778edc211cad WHIRLPOOL a659c1f8dc8452299ce98e7b9d7e66515b1c8fcf8922d97888bc761acbe4e6d40412c635e5bbee9207c68cdf9c46d13b3c8e4012f38abb54c930a1b2eab5348d
 EBUILD llvm-3.5.0.ebuild 15104 SHA256 f3f8698353f9c5d2c9e28ade63b4573e6efb5cbace7da0ee400cfcd7e3e486b6 SHA512 a3434a4ef8050300f9e7309e35693c0b928bb5b438d95c54cf76298f29669b16466711f341ef0d37a3b6817342667f18130d106a2e839fcac0855a0db519758a WHIRLPOOL 4f662cdf9fb8b53d17c6c958b9734e91a7d085bcba0d7ad32c8a21e079adc57f62ef925ae1d1016e1642452e62d2cba1e8a9e39241d783cca8baad43bf9045e5
-EBUILD llvm-3.5.1.ebuild 15060 SHA256 bda12820f3ca90a7e4fcccca111f8e52182b8e3c8c5d711beeb910edeaac44c9 SHA512 f66ec4463a87960e6a4ffef03c1d2fbc86c2e4871c23be260d2c4a11a6d54e4f81332735e1506575dbc77a9644a07107fedbd664a41cd4d96ef06bba099445e0 WHIRLPOOL 76855732a46f1096bbb374788ba2b8435f8a1ca30f974de3679517cfd7a87cdfaf2d79d4b5a14d6fba8267fdee9315a88c262d94f992629afa728670a557c400
+EBUILD llvm-3.5.1.ebuild 15074 SHA256 dd3aa18c262f7ce59a03c3d87d64c1cec8272bbe449f5a8c1bc98f225fc494ca SHA512 1c3d82c3e8a00b31b739abf9bafe3bf29555bb55cd4bbb40c3232ee2d95eb6b7bafbe4940d1cd56b197eb54d4d5d069d5af0265c859075a167fa6e007610cd92 WHIRLPOOL 8e72d26b095c73268858eeb6476790ef0112ba8198d543fafcf213be30945910fb5fd576a77d957806ba42b59d2171e91d30d7b4d0971889eb7e04006ddb25f0
 EBUILD llvm-9999.ebuild 13914 SHA256 96c731cfe077bec0da28a5dc82179e6e70bda7fc77c8c25ed4d64eca845738f8 SHA512 ed6a18ae0a1c59c3327d118d478a03e4a73953d9a5a3b2c0953ce80076f2d07db9e83e078a7af00e094191d2dc1c3372640340a63ccb7bac77a9756f679c5f98 WHIRLPOOL e70e3977d37f1dcbda3541f028c1d45065453f23ec280bba2aaab69386f390a2a2fea5cbfc7050ae16ef5beb0ff3336839e988b6cf8d95235097713d627fba8b
-MISC ChangeLog 36742 SHA256 f9616bfd26333f3cdda2f3667ea16cde962110537eaeab9b99471f2a7b7f4a54 SHA512 7ea0a63e9f9e46e42d448328c1e4dcc1a72f84a82a85014a6a259669f225e50ce82c5ca7beac63430795d638afbae27b581871055773c0bbc5620a61579c50ea WHIRLPOOL 9757ebf428044f6087f64ca9b627e252a7d6433257c5a9e4d04e23928a2ff1f340d85dc9da6941d2aa4718182cd4b2b6e01f8f61c46a617318abf61116b95f29
+MISC ChangeLog 36850 SHA256 dfd8577ee60c7438fdb9c1576838218ba5ba2a51a7d18c2bb95dcea13411fbc2 SHA512 4d3d23cd631e6987e8c2c90090444d4d932ff1dd2c1a878fd0bfb9e023bdf816a0e8060242fb99b0357beb396075d628900107c9c2118eaf0fb3d59b7be3d26d WHIRLPOOL 3d6a725587fc13fca8a72f6482fced44758cb1ab75c74c7bc05f5f4ef270e6a46971f960791f8b8c0f96a7a15aa208835982e68544e75ac29126e2d501ea24cc
 MISC metadata.xml 2787 SHA256 22dc7b91c98fb4258271cc9cd4bd99f214b30f258bbdfea83dc37ac74df8d498 SHA512 4fca0d2551a889e7800c688077adf405697d05730bf66621ac53fdefeeeaddb7a8d868973edc9a6fe48e9a07734f1d43fd88229bae693fe181a7dbb95eeb9481 WHIRLPOOL 6284033d40bef02510f924ec1e6a9d3e1072bf26945fdedde0ddaf1d6d35c3d30971cdefa583a8e4d9db3da67bee04145ace15ded4cee63f534588b66633c76b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlS/cMIACgkQFYEBGcdFJfIHogD+JOmzHmDpNc31flU7P9ma3LTw
-EdWo/QtK0q/1mYxY8CsBAJXKtxPR+TJ3AHTQ+iik5MiXSOkoglS2KLoLEF+emeie
-=UpIE
+iF0EAREIAAYFAlS/vs0ACgkQFYEBGcdFJfKF+AD9HoG/larin0PAsECs+BiSyL/r
+YVOFClitDRHB/NHMRBMA93kCDl5UGldQpKq4U7/mrUls4qfCOmI9IF1aOPZKPAA=
+=SASH
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-3.5.1.ebuild b/sys-devel/llvm/llvm-3.5.1.ebuild
index be5e9b353203..540bf02035c2 100644
--- a/sys-devel/llvm/llvm-3.5.1.ebuild
+++ b/sys-devel/llvm/llvm-3.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.1.ebuild,v 1.1 2015/01/21 09:26:20 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.1.ebuild,v 1.2 2015/01/21 14:59:19 voyageur Exp $
 
 EAPI=5
 
@@ -389,9 +389,9 @@ multilib_src_install() {
 			dohtml -r "${S}"/docs/_build/html/
 		else
 			if ! use clang; then
-				rm "${WORKDIR}"/${P}-manpages/clang.1 || die
+				rm "${WORKDIR}"/${PN}-3.5.0-manpages/clang.1 || die
 			fi
-			doman "${WORKDIR}"/${P}-manpages/*.1
+			doman "${WORKDIR}"/${PN}-3.5.0-manpages/*.1
 		fi
 
 		# Symlink the gold plugin.