[patch] go-module.patch

go-module.patch (text/plain), 3.32 KB, created by William Hubbs on 2020-03-23 14:02:56 UTC

diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild
index a173e176860..f7048980e39 100644
--- a/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild
+++ b/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild
@@ -2,48 +2,56 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
-EGO_SRC=gitlab.com/yawning/obfs4.git
-EGO_PN=${EGO_SRC}/...
-
-EGO_VENDOR=(
-	"github.com/agl/ed25519 5312a61534124124185d41f09206b9fef1d88403"
-	"github.com/dsnet/compress v0.0.1"
-	"gitlab.com/yawning/utls.git v0.0.11-1 gitlab.com/yawning/utls/-"
-	"git.schwanenlied.me/yawning/bsaes.git 26d1add596b6d800bdeeb3bc3b2c7b316c056b6d git.schwanenlied.me/yawning/bsaes"
-	# Newer versions of packages which are in the tree
-	"golang.org/x/crypto a5d413f7728c81fb97d96a2b722368945f651e78 github.com/golang/crypto"
-	"golang.org/x/net 74de082e2cca95839e88aa0aeee5aadf6ce7710f github.com/golang/net"
-	"golang.org/x/sys 9eb1bfa1ce65ae8a6ff3114b0aaf9a41a6cf3560 github.com/golang/sys"
-)
-
-inherit golang-build golang-vcs-snapshot
+inherit go-module
 
 DESCRIPTION="An obfuscating proxy supporting Tor's pluggable transport protocol obfs4"
 HOMEPAGE="https://gitlab.com/yawning/obfs4"
+
+EGO_SUM=(
+	"git.schwanenlied.me/yawning/bsaes.git v0.0.0-20190320102049-26d1add596b6"
+	"git.schwanenlied.me/yawning/bsaes.git v0.0.0-20190320102049-26d1add596b6/go.mod"
+	"git.torproject.org/pluggable-transports/goptlib.git v1.0.0"
+	"git.torproject.org/pluggable-transports/goptlib.git v1.0.0/go.mod"
+	"github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412"
+	"github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod"
+	"github.com/dchest/siphash v1.2.1"
+	"github.com/dchest/siphash v1.2.1/go.mod"
+	"github.com/dsnet/compress v0.0.1"
+	"github.com/dsnet/compress v0.0.1/go.mod"
+	"github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod"
+	"github.com/klauspost/compress v1.4.1/go.mod"
+	"github.com/klauspost/cpuid v1.2.0/go.mod"
+	"github.com/ulikunitz/xz v0.5.6/go.mod"
+	"gitlab.com/yawning/utls.git v0.0.11-1"
+	"gitlab.com/yawning/utls.git v0.0.11-1/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c"
+	"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
+	"golang.org/x/net v0.0.0-20190328230028-74de082e2cca"
+	"golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190329044733-9eb1bfa1ce65"
+	"golang.org/x/sys v0.0.0-20190329044733-9eb1bfa1ce65/go.mod"
+	"golang.org/x/text v0.3.0"
+	"golang.org/x/text v0.3.0/go.mod"
+	)
+go-module_set_globals
 SRC_URI="https://gitlab.com/yawning/obfs4/-/archive/${P}/obfs4-${P}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
+	${EGO_SUM_SRC_URI}"
 
 LICENSE="BSD BSD-2 CC0-1.0 BZIP2 GPL-3+ MIT public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
 
-DEPEND=">=dev-go/go-text-0.3.0
-	>=dev-go/goptlib-1.0.0
-	>=dev-go/siphash-1.2.1"
+S="${WORKDIR}/obfs4-${P}"
 
 src_compile() {
-	golang-build_src_compile
-	local binfile=$(find "${T}" -name a.out)
-	[[ -x ${binfile} ]] || die "a.out not found"
-	cp -a ${binfile} obfs4proxy
+	go build -o ${PN} . || die
 }
 
 src_install() {
 	default
 	dobin obfs4proxy
-	cd src/${EGO_SRC}
 	doman doc/obfs4proxy.1
 	dodoc README.md ChangeLog doc/obfs4-spec.txt
 }