[gentoo-commits] repo/gentoo:master commit in: dev-lang/go/files/, dev-lang/go/

[William Hubbs]

commit:     2fe67f29b8e17de2dad0823ddf349a298e5960c2
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 19:56:23 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 20:39:09 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fe67f29

dev-lang/go: remove incorrect patch for #558368

 dev-lang/go/files/go-1.5.1-darwin-sysctl.patch | 11 -----------
 dev-lang/go/go-1.5.1-r1.ebuild                 |  1 -
 dev-lang/go/go-1.5.1.ebuild                    |  1 -
 3 files changed, 13 deletions(-)

diff --git a/dev-lang/go/files/go-1.5.1-darwin-sysctl.patch b/dev-lang/go/files/go-1.5.1-darwin-sysctl.patch
deleted file mode 100644
index 5cec4b6..0000000
--- a/dev-lang/go/files/go-1.5.1-darwin-sysctl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cmd/dist/util.go.
-+++ src/cmd/dist/util.go
-@@ -404,7 +404,7 @@
- 	switch gohostos {
- 	case "darwin":
- 		// Even on 64-bit platform, darwin uname -m prints i386.
--		if strings.Contains(run("", CheckExit, "sysctl", "machdep.cpu.extfeatures"), "EM64T") {
-+		if strings.Contains(run("", CheckExit, "/usr/sbin/sysctl", "machdep.cpu.extfeatures"), "EM64T") {
- 			gohostarch = "amd64"
- 		}
- 	case "solaris":

diff --git a/dev-lang/go/go-1.5.1-r1.ebuild b/dev-lang/go/go-1.5.1-r1.ebuild
index 23d3717..ed766ec 100644
--- a/dev-lang/go/go-1.5.1-r1.ebuild
+++ b/dev-lang/go/go-1.5.1-r1.ebuild
@@ -113,7 +113,6 @@ src_prepare()
 		sed -i -e 's/"-Werror",//g' src/cmd/dist/build.go ||
 			die 'sed failed'
 	fi
-	epatch "${FILESDIR}"/${P}-darwin-sysctl.patch
 	epatch_user
 }
 

diff --git a/dev-lang/go/go-1.5.1.ebuild b/dev-lang/go/go-1.5.1.ebuild
index 139b350..a69f787 100644
--- a/dev-lang/go/go-1.5.1.ebuild
+++ b/dev-lang/go/go-1.5.1.ebuild
@@ -113,7 +113,6 @@ src_prepare()
 		sed -i -e 's/"-Werror",//g' src/cmd/dist/build.go ||
 			die 'sed failed'
 	fi
-	epatch "${FILESDIR}"/${P}-darwin-sysctl.patch
 	epatch_user
 }