Gentoo binutils-apple patch has been applied upstream, so no longer necessary in 9999. Update patch header with upstream commit.

(Portage version: 2.2.01.20153-prefix/cvs/SunOS i386)

4 files changed, 10 insertions, 6 deletions

diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog
index c7e510fa3549..edff42ab6005 100644
--- a/sys-devel/clang/ChangeLog
+++ b/sys-devel/clang/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/clang
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.55 2012/02/21 13:49:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.56 2012/02/28 09:09:31 grobian Exp $
+
+  28 Feb 2012; Fabian Groffen <grobian@gentoo.org> clang-3.0-r3.ebuild,
+  clang-9999.ebuild, files/clang-3.0-gentoo-binutils-apple.patch:
+  Gentoo binutils-apple patch has been applied upstream, so no longer necessary
+  in 9999.  Update patch header with upstream commit.
 
   21 Feb 2012; Fabian Groffen <grobian@gentoo.org> clang-3.0-r3.ebuild,
   +files/clang-3.0-gentoo-binutils-apple.patch, clang-9999.ebuild:
diff --git a/sys-devel/clang/clang-3.0-r3.ebuild b/sys-devel/clang/clang-3.0-r3.ebuild
index a7614f7e0225..e9bd61a12dda 100644
--- a/sys-devel/clang/clang-3.0-r3.ebuild
+++ b/sys-devel/clang/clang-3.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.0-r3.ebuild,v 1.2 2012/02/21 13:49:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.0-r3.ebuild,v 1.3 2012/02/28 09:09:31 grobian Exp $
 
 EAPI=3
 
@@ -48,7 +48,7 @@ src_prepare() {
 	sed -e "/LLVMgold.so/s#lib/#$(get_libdir)/llvm/#" \
 		-i  tools/clang/lib/Driver/Tools.cpp \
 		|| die "gold plugin path sed failed"
-	# Properly detect Gentoo's binutils-apple version
+	# Properly detect Gentoo's binutils-apple version (committed in trunk)
 	epatch "${FILESDIR}"/${PN}-3.0-gentoo-binutils-apple.patch
 	# Specify python version
 	python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index 0078a9d3959e..a180f27e0ba3 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.25 2012/02/21 13:49:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.26 2012/02/28 09:09:31 grobian Exp $
 
 EAPI=4
 
@@ -49,8 +49,6 @@ src_prepare() {
 	sed -e "/LLVMgold.so/s#lib/#$(get_libdir)/llvm/#" \
 		-i  tools/clang/lib/Driver/Tools.cpp \
 		|| die "gold plugin path sed failed"
-	# Properly detect Gentoo's binutils-apple version
-	epatch "${FILESDIR}"/${PN}-3.0-gentoo-binutils-apple.patch
 	# Specify python version
 	python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view
 
diff --git a/sys-devel/clang/files/clang-3.0-gentoo-binutils-apple.patch b/sys-devel/clang/files/clang-3.0-gentoo-binutils-apple.patch
index 4164138ab79a..944ccaf4fa20 100644
--- a/sys-devel/clang/files/clang-3.0-gentoo-binutils-apple.patch
+++ b/sys-devel/clang/files/clang-3.0-gentoo-binutils-apple.patch
@@ -1,5 +1,6 @@
 http://llvm.org/bugs/show_bug.cgi?id=8339
 https://bugs.gentoo.org/show_bug.cgi?id=395013
+http://llvm.org/viewvc/llvm-project?view=rev&revision=151612
 
 Tweak version detection bit to cope with Gentoo's slightly different
 output for ld -v.