Update sys-devel/llvm-3.5.0, sys-devel/llvm-3.5.2, sys-devel/llvm-3.7.1-r3

4 files changed, 44 insertions, 45 deletions

diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 5be72fa0..417d71fd 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -102,13 +102,13 @@ EBUILD llvm-3.4.1-r1.ebuild 15393 SHA256 b9857f3b78be5c15183daad4ea151ad4abcee3c
 EBUILD llvm-3.4.1-r2.ebuild 15593 SHA256 6f6fa0dbc498cf90e0d909f4081cf5564fc6280903ef8dc82c05390c2a659b28 SHA512 49f63ffa138ca1216f3c257f70c7840091573c1fbb06302d4232213029a89a5c2ad0ea08c7629e05ee1b738c5d9062990f9902071e8f269c96d0093a8ac30f23 WHIRLPOOL 74c73ce78890053e41068456f23fc416baa2efd7e8d3d1624e8e4c6844fd918ebbabb26ffd04083d0269f3ff7ba8fc6a85cee2057a92dd730cc4e48cf027e5fa
 EBUILD llvm-3.4.2.ebuild 16332 SHA256 815d7806197383a8599a68f03a452132a3bcf01f6d2459ad52b46326a10fd04f SHA512 2a773bab5738d192d8821537faefd5dbc2962336f2c9a011f399378570bb50267e2be635892f453db65dae8818bbf6900d4d8d0909decd21108a3d541087348a WHIRLPOOL 81d49df351dbff85c911db1b21804660cd05053c4e22b262415f6c2f0231d3715288ba0b6b707f6cda6df0e1aaef91f616eb964463ff30ace7872a18b3fd433f
 EBUILD llvm-3.4.ebuild 15005 SHA256 e7b0bbb5a72009f0d79dbb0be247400026d0b1a2edaf6900469cef1f29290d1a SHA512 a32c1d128cf4b9be46102db6269dbe2f25bbfc1a31fcf88eff51a928851d99ee1e6730f4a64aafd5ca31c71a91ebcbd76163303b2f02f8d811c7087deee85f18 WHIRLPOOL a223c4a7053f3ed78186192ab4b67ed49c970bc455fcac9b1109787f213e6e8e899e9fe2d7df313e2a9a48243e0a2e050b53d844fa63555a8223b5efae8f4cbe
-EBUILD llvm-3.5.0.ebuild 15685 SHA256 913c17b1735d2a144f4c411c2be8371493f932211be927c0f5a37040df407621 SHA512 b1bf0266d20e6aa085de42606ecfd2f0c7dc6f255a17fb3311e63988bab1d9a32811f1c3d0845e265453bfa22f5130e60ce6c98855d133a75e5929c6ad0cb2e0 WHIRLPOOL 74cbb7199ed4f6ed48d4442b1e5e43699b97b82ee348e6e2abb5f4637d5ac477e529852c14808561afdf606698dd2a8a013deaa2e646bad85978fb25b7bee2ea
+EBUILD llvm-3.5.0.ebuild 15682 SHA256 5d4582ad65ff51ae84568dab5a3fc7f9231b1bf9a5b33b1489f498f1fc60b291 SHA512 6ce7978c291d7bda9984b2f7389453e17de0cf220fec958e16baccdd58e459305bf34709b0901bc12621b44d9615b4db4ec578fc37daa95462a90ca4d5de66a0 WHIRLPOOL 2eff57a073e82d8ce1e228c3421bc9112ff8e83c53ba9ab58df44160824f64123f7bc29c9f1b7565ef15a63d741001307eaf44aa10f188b4e197f7e6b61a97a2
 EBUILD llvm-3.5.1.ebuild 15777 SHA256 c63945a63f92833887ef7edd5e63e4654ac440283965852537027b4f4eead1f9 SHA512 807c07ade9db608562bc9343e6f9a2e9bc3f51c14d82af2df56abee5ab5d056f649dff719a4f7a06a3db8ff814f09b15c0d3f752b67c11350c2e2ec82da19db1 WHIRLPOOL cbce979a5365a1301e4c4c1230a99b6431f7cbef5d1a72932e7b94b4cf2b875ffc015d7c10a549c571c1cf88ac4b9b7d99689f826a776194c20ee5bb87f59bbe
-EBUILD llvm-3.5.2.ebuild 15948 SHA256 f89ce760a39d0161e392cf6f1936768da581e27e89ecb67cf435eca4cd043824 SHA512 a676d2a280fd15a5b7ff6d4ac033b5207a748bba66a44ece0bfafe05090bfdf153108df85040cdce0d79627a87ec6c584ec11d054dd1292642435e316cf4d189 WHIRLPOOL c19fe0b796f6be102f48ee339390a736d83cdb4835334e741c9472dcffe78d9d94313aea622fd64ebf611bcda18fc382c2d710236c4ab7ffd25baa71b9461e06
+EBUILD llvm-3.5.2.ebuild 15944 SHA256 34452c7bd65b7eda4f7cfc57653b8ce767d3fc59b29817513e7a7d369f1d5d74 SHA512 c4ee8c7861769a202da6bdf973c208d8c2b9ad60f62a7ef6e16caf9ca18948a553790cd69eef8921f78fbb41c1ec80ef86ced864e9b835cf541d92179ab554f2 WHIRLPOOL db690ea7e45b2bcdab9426d5f76687b78442b40b2e2f6846c57cea8d61ff032c30ac246a0f09efb1a798fae8249c557757592337e4bfae1de55e0cdaa673e647
 EBUILD llvm-3.6.0.ebuild 15718 SHA256 5cafc9010021eb3745ca33620a7458f95d8469c875ad262aa20d8fa565244dc2 SHA512 d2a3a29e63461285e515a2d63230ff7ffb90f14a1d9d24f438789d45e080dc3f4d7a2a21e3b92bd8642c29961e1a3764901b2dbd2cd5db2f21770af1d2f1bd70 WHIRLPOOL 11855a643f7083e1562cd4d67b47e214f9c6dfce9e1e7fa5fd7ef62bf2c85fc6d8f7ced3be534250d7281c3324d1a0975af3b294eb82031e011a809bb9314539
 EBUILD llvm-3.6.1.ebuild 15970 SHA256 564249e2c2960b48a5c1c3e9ee55bf49ec72a5890abe2b90c1a6233c86dfeda5 SHA512 10f58036be1d6e4967e683e8c73da38b8083eaf13fad0367ab16e0ccc66a0f93fcc332263e8d4adc8f7102e091adc499374ee00663a3997eff40a830a0c76c7c WHIRLPOOL d40cd4d009bd83b08dc9ace117e0a05707727225449ebc60494bd5437ff6c742b4a4f13d3c6e9a8c0242cb74383529d27a6611849b8fcedf31575bc21ad9f0f5
 EBUILD llvm-3.7.1-r1.ebuild 16156 SHA256 26046b7e521ef620b64d80d7eb4fab480a2e0b2bedbd8b78ab5ec9992992ece7 SHA512 bf82d1850bab723539c66ae8a6ae1bf60c727c0f0f5b6dc1973025f0bfb1db9c92c5179c4acfd4ba6d66edd45b3fb1bc1bdf4a30ff897017fd7969100074dc87 WHIRLPOOL 970139cca11933f733548c9d112ed38b02838106c750fe57ed674719b43bccb7e40d74d902508a81c0635242b4428e2f1ee47d70a0a8474557c5c64d6b381aac
 EBUILD llvm-3.7.1-r2.ebuild 16308 SHA256 5c5861a1876d235a115b31cfe491782cd49321d5ae3da4d0f7cb39bec240183b SHA512 7a62faa31d87a175668567ea4d7282a979337949383fa8fa31f2e09ca419fe21ae47b4ffd711b4cb3aaa09ef7d4a8e54447760068b03583bc64645f6ff995816 WHIRLPOOL 72034a7bf8d157eeb1aaa260a8f6f2d70d7133f7ff53746bc69767f72f7cf653eae2fb24eb1f74026593bf730743dbbf4ce08097cd73bc6a7f9267303fc55740
-EBUILD llvm-3.7.1-r3.ebuild 16526 SHA256 1e8980dc3bdc5fc8808433309f1be2640b7c200c90d77cacc55ff737f48b6d93 SHA512 814ff7095035f4b41d3478a54c75284f54feee2725d5b734cfe4e4ae1ef16f528aca491da7ba8393a169e8a78b50a90d7caeb7acfddadc6a84aef2f9cf254b1f WHIRLPOOL 7207869ded58995fba1e7cb69b2b54cc41c73951db79327c5ccaa50372d797c19da0ab0490f26eeba69405e1099d7d84856ab1603efa2b549f209105540aeacb
+EBUILD llvm-3.7.1-r3.ebuild 16540 SHA256 7d721c5b6d9ca38e7e7add82f503945dddf3977f599eb4c289cfc36730d8a142 SHA512 691ac16d12f032e8591a0801a067d118f873b2d97f5fed5d6a34d1fd42cdd09dfa3d18e2a5301d0f27ae0843beb5f42267726de8447e64199bb551dc2a476b8a WHIRLPOOL 02b2cc31a07529e3e8deaf649265600ca2da63599e416f000ebdce4c45bbdac44eb4acd4e842bb0d65ab8f697a578c2303462313509556a7d3f59c9bc57138ef
 EBUILD llvm-3.7.1.ebuild 16125 SHA256 dbe9e049646a46d71bf50ef8e5a91b76cc91103c7b2cc76e497077cbe8bc492c SHA512 dd3c7495e66b50d6b72ae3d8745c0ae3b965cbbeac56775f28148de484f0c781ac821ca730b031be7d9a77d6bbed63323747c2bfcdb4c74e59921bb38ae476ba WHIRLPOOL cd8a617b69ab58dfaf026b6647ad872e32d64adb9189f9a98d3d44242ebb655c07aee3e0bba0cde26d6ddf2d9ce769915406fffba01d68338b32e7e6b9d7e0b3
 EBUILD llvm-3.8.0-r2.ebuild 15483 SHA256 c3e8cfe1fc913b96c1d439014e75386873338b472911ecfe1feea127c6077611 SHA512 4b92381ed484697b8df5d3b4e18e7ccf9e96e1fa9af8ba560fe542d86f7eeffb1599d15dacedacd15e5b98750c608d83c2796cf3d1e017bff9c922c03cbe5943 WHIRLPOOL e821fe0b52e6a19e8172985fe1b6b192e88170fb1e28677a0843450ead2538f7d2168f4f82ceba546e2710961c56462bff1c4138a98a7f3083ee2a45d0de4a63
diff --git a/sys-devel/llvm/llvm-3.5.0.ebuild b/sys-devel/llvm/llvm-3.5.0.ebuild
index 52b154e4..14f9da96 100644
--- a/sys-devel/llvm/llvm-3.5.0.ebuild
+++ b/sys-devel/llvm/llvm-3.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: d6019fc69e7d0308cec835f9f9c6a6e29de2aa75 $
+# $Id: e163d97b8623d5c4f7e4c9ed374296fbb938a8a7 $
 
 EAPI=5
 
@@ -143,11 +143,11 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch
-	epatch "${FILESDIR}"/${PN}-3.5-gcc-4.9.patch
-	epatch "${FILESDIR}"/${PN}-3.5-gentoo-install.patch
+	epatch "${FILESDIR}"/3.6.2/nodoctargz.patch
+	epatch "${FILESDIR}"/3.6.2/gcc-4.9.patch
+	epatch "${FILESDIR}"/3.5.2/gentoo-install.patch
 
-	epatch "${FILESDIR}"/${P}-fix_LLVMExports_cmake.patch
+	epatch "${FILESDIR}"/3.5.0/fix_LLVMExports_cmake.patch
 
 	local sub_files=(
 		Makefile.config.in
@@ -162,10 +162,10 @@ src_prepare() {
 		)
 
 		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
+		epatch "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
 
-		epatch "${FILESDIR}"/clang-3.5-gentoo-install.patch
-		epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
+		epatch "${FILESDIR}"/3.5.2/clang/gentoo-install.patch
+		epatch "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch
 		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 
 		if use prefix; then
@@ -444,7 +444,7 @@ multilib_src_install() {
 	# to just fix this, so we correct it post-install
 	local lib= f= odylib= ndylib= libpv=${PV}
 	if [[ ${CHOST} == *-darwin* ]] ; then
-		eval $(grep PACKAGE_VERSION= "${WORKDIR}"/${P}.src/configure)
+		eval $(grep 'PACKAGE_VERSION=' "${WORKDIR}"/${P}.src/configure)
 		[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
 		libpvminor=${libpv%.[0-9]*}
 		for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_{osx,iossim}_dynamic.dylib; do
diff --git a/sys-devel/llvm/llvm-3.5.2.ebuild b/sys-devel/llvm/llvm-3.5.2.ebuild
index 259096ef..065c1b89 100644
--- a/sys-devel/llvm/llvm-3.5.2.ebuild
+++ b/sys-devel/llvm/llvm-3.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: 6d3a5ce61fc8894eca98a030b5f9115ed160d893 $
+# $Id: e158a2d87306b08646493f3fe06a88fdc494121d $
 
 EAPI=5
 
@@ -144,16 +144,15 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch
-	epatch "${FILESDIR}"/${PN}-3.5-gcc-4.9.patch
-	epatch "${FILESDIR}"/${PN}-3.5-gentoo-install.patch
-	epatch "${FILESDIR}"/${P}-gcc-5.1.patch
+	epatch "${FILESDIR}"/3.6.2/nodoctargz.patch
+	epatch "${FILESDIR}"/3.6.2/gcc-4.9.patch
+	epatch "${FILESDIR}"/3.5.2/gentoo-install.patch
+	epatch "${FILESDIR}"/3.5.2/gcc-5.1.patch
 	# Make ocaml warnings non-fatal, bug #537308
 	sed -e "/RUN/s/-warn-error A//" -i test/Bindings/Ocaml/*ml  || die
 	# disable use of SDK on OSX, bug #568758
 	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
 
-
 	local sub_files=(
 		Makefile.config.in
 		Makefile.rules
@@ -167,10 +166,10 @@ src_prepare() {
 		)
 
 		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
+		epatch "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
 
-		epatch "${FILESDIR}"/clang-3.5-gentoo-install.patch
-		epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
+		epatch "${FILESDIR}"/3.5.2/clang/gentoo-install.patch
+		epatch "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch
 		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 
 		if use prefix; then
@@ -449,7 +448,7 @@ multilib_src_install() {
 	# to just fix this, so we correct it post-install
 	local lib= f= odylib= ndylib= libpv=${PV}
 	if [[ ${CHOST} == *-darwin* ]] ; then
-		eval $(grep PACKAGE_VERSION= "${S}"/configure)
+		eval $(grep 'PACKAGE_VERSION=' "${S}"/configure)
 		[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
 		libpvminor=${libpv%.[0-9]*}
 		for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_{osx,iossim}_dynamic.dylib; do
diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
index 2c5f7f1e..643aafb5 100644
--- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: 5f6e18433df076124dfb5c9aa72ba8a0a668aaa7 $
+# $Id: 02635d1e52d0e470af39061def55158e670b68c7 $
 
 EAPI=6
 
@@ -141,21 +141,21 @@ src_prepare() {
 	# Make ocaml warnings non-fatal, bug #537308
 	sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
 	# Fix libdir for ocaml bindings install, bug #559134
-	eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-multilib.patch
+	eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
 	# Do not build/install ocaml docs with USE=-doc, bug #562008
-	eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.patch
+	eapply "${FILESDIR}"/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
 
 	# Make it possible to override Sphinx HTML install dirs
 	# https://llvm.org/bugs/show_bug.cgi?id=23780
-	eapply "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+	eapply "${FILESDIR}"/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
 
 	# Prevent race conditions with parallel Sphinx runs
 	# https://llvm.org/bugs/show_bug.cgi?id=23781
-	eapply "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+	eapply "${FILESDIR}"/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
 
 	# Prevent installing libgtest
 	# https://llvm.org/bugs/show_bug.cgi?id=18341
-	eapply "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch
+	eapply "${FILESDIR}"/9999/0005-cmake-Do-not-install-libgtest.patch
 
 	# Fix llvm-config for shared linking, sane flags and return values
 	# in order:
@@ -165,49 +165,49 @@ src_prepare() {
 	# - backported r260343 that fixes cross-compilation
 	# combination of backported upstream r252532 with our patch
 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/llvm-3.7.1-llvm-config-0.patch
-	eapply "${FILESDIR}"/llvm-3.7.1-llvm-config-1.patch
-	eapply "${FILESDIR}"/llvm-3.7.1-llvm-config-2.patch
-	eapply "${FILESDIR}"/llvm-3.7.1-llvm-config-3.patch
+	eapply "${FILESDIR}"/3.7.1/llvm-config-0.patch
+	eapply "${FILESDIR}"/3.7.1/llvm-config-1.patch
+	eapply "${FILESDIR}"/3.7.1/llvm-config-2.patch
+	eapply "${FILESDIR}"/3.7.1/llvm-config-3.patch
 
 	# Fix msan with newer kernels, #569894
-	eapply "${FILESDIR}"/llvm-3.7-msan-fix.patch
+	eapply "${FILESDIR}"/3.7.1/msan-fix.patch
 
 	# disable use of SDK on OSX, bug #568758
 	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
 
 	if use clang; then
 		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		eapply "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
+		eapply "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
 
 		# Support gcc4.9 search paths
 		# https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3
-		eapply "${FILESDIR}"/clang-3.8-gcc4.9-search-path.patch
+		eapply "${FILESDIR}"/3.8.1/clang/gcc4.9-search-path.patch
 
-		eapply "${FILESDIR}"/clang-3.6-gentoo-install.patch
+		eapply "${FILESDIR}"/3.7.1/clang/gentoo-install.patch
 
-		eapply "${FILESDIR}"/clang-3.7-darwin_prefix-include-paths.patch
+		eapply "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch
 		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 
 		# Fix -isystem support in ccc-analyzer
-		eapply "${FILESDIR}"/clang-3.7.1-ccc-analyzer-isystem.patch
+		eapply "${FILESDIR}"/3.7.1/clang/ccc-analyzer-isystem.patch
 
 		sed -i -e "s^@EPREFIX@^${EPREFIX}^" \
 			tools/clang/tools/scan-build/scan-build || die
 
 		# Install clang runtime into /usr/lib/clang
 		# https://llvm.org/bugs/show_bug.cgi?id=23792
-		eapply "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
-		eapply "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
+		eapply "${FILESDIR}"/3.7.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
+		eapply "${FILESDIR}"/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
 
 		# Do not force -march flags on arm platforms
 		# https://bugs.gentoo.org/show_bug.cgi?id=562706
-		eapply "${FILESDIR}"/cmake/${PN}-3.7.0-compiler_rt_arm_march_flags.patch
+		eapply "${FILESDIR}"/3.7.1/compiler-rt/arm_march_flags.patch
 
 		# Make it possible to override CLANG_LIBDIR_SUFFIX
 		# (that is used only to find LLVMgold.so)
 		# https://llvm.org/bugs/show_bug.cgi?id=23793
-		eapply "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
+		eapply "${FILESDIR}"/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
 
 		# Fix git-clang-format shebang, bug #562688
 		python_fix_shebang tools/clang/tools/clang-format/git-clang-format
@@ -215,7 +215,7 @@ src_prepare() {
 		pushd projects/compiler-rt >/dev/null || die
 
 		# Fix msan with newer kernels, compiler-rt part, #569894
-		eapply "${FILESDIR}"/compiler-rt-3.7-msan-fix.patch
+		eapply "${FILESDIR}"/3.7.1/compiler-rt/msan-fix.patch
 
 		# Fix WX sections, bug #421527
 		find lib/builtins -type f -name '*.S' -exec sed \
@@ -232,13 +232,13 @@ src_prepare() {
 			-i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
 
 		# Fix Python paths, bugs #562436 and #562438
-		eapply "${FILESDIR}"/${PN}-3.7-lldb_python.patch
+		eapply "${FILESDIR}"/3.7.1/lldb/python.patch
 		sed -e "s/GENTOO_LIBDIR/$(get_libdir)/" \
 			-i tools/lldb/scripts/Python/finishSwigPythonLLDB.py || die
 
 		# Fix build with ncurses[tinfo], #560474
 		# http://llvm.org/viewvc/llvm-project?view=revision&revision=247842
-		eapply "${FILESDIR}"/cmake/${PN}-3.7.0-lldb_tinfo.patch
+		eapply "${FILESDIR}"/3.7.1/lldb/tinfo.patch
 	fi
 
 	# User patches