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

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 (file)
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 23d37172ec09d9615778730601ebfefadfeadcfc..ed766ec3876d731ffe3ddf1e285e5aabba590df0 100644 (file)
--- 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 139b35042ebe2adf67e01ea64b9a3b4b45cbbe44..a69f787266ee7d788d8c2739484cef5771a3ad2c 100644 (file)
--- 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
 }