gentoo resync : 25.08.2018

4 files changed, 94 insertions, 64 deletions

diff --git a/dev-go/go-net/Manifest b/dev-go/go-net/Manifest
index 85f625fe0576..d84a4abd39d6 100644
--- a/dev-go/go-net/Manifest
+++ b/dev-go/go-net/Manifest
@@ -1,6 +1,6 @@
-DIST go-net-0_pre20150804.tar.gz 539435 BLAKE2B f59222bd025bff05353c328072a028092bdc77c73fc438b78fb7c1aee5d3b152b1242ad5603a9da9e7e0a7bd1684bebe733342c0d5e415d1d1728f6e75e06cbd SHA512 02a9734f8335909a15280e925b11ff03b96fbedd6e48fa5c3f869ab1a8b3062971d634f7043f92cee685c618222b147fdee915f1d5d83bd82cdde171970287e3
 DIST go-net-0_pre20160216.tar.gz 741192 BLAKE2B ed4ca3ddc71f794a92746e360157967582958e4de29a46c5e63964694986e5a8a4f95062a1d46881941e8e8dfb848bbd9c4bd3b7008d8f2da357c2cae9a441ae SHA512 75db9098b33ede5621fce36645ebe946fad911c815dae219d74242b15714d1b9a3d8544f5f8c90b58989cea3a46b5688d20f705cb24a7d31f201ec218e69e78f
-EBUILD go-net-0_pre20150804.ebuild 1163 BLAKE2B e39fa116a096cbaab9b99131479eeb3149f097671b27a83607fef79ad032a217d789b187eb66fec46f5f4753c8e6897fceb9dae653920039e4b17e88ff8faf40 SHA512 ca6adc9c8ac75dffb0022f9c89819ebe47c4ca76e84bac416a1b1d844a11f4b8f4f16e8df463bcaf3db7f81944818b76e55278a935606bb868a53d7e8c8a56ce
+DIST go-net-0_pre20180816.tar.gz 965206 BLAKE2B 018ab877bfa7208bb0ca9b4ede85077ed37c8ee3c7065569646e6c9704715d6810b0286276ea0fa9a271f12ffbe964b41f55ec762711c8a43ccea564607f3265 SHA512 d56f5608e64e8d883a782f0c460f08da20e7d01a97330fad35c8757420ac82fb84b657c3f64e3c4d90a08cc4d8905ab37225d6fab8472e8f1fd3d7be212df8b9
 EBUILD go-net-0_pre20160216.ebuild 1193 BLAKE2B 1ee2b2456b71ac10706c377d79da8d23cdc0b690b3fc0372d3e6ab5f0b99a96c52fecdca35d0529a3ab9d047d94df6ffe56cbb67e9c29315383ab2d89187019b SHA512 4103011ea0a480441a1d8c9ceebd82ad0b12bcf4eaadaac5bf6b7029c32fd76309cf674abd3e1a1e18bfbcd196c4c6595e3b1679070edf162c72b2d1331c0830
-EBUILD go-net-9999.ebuild 1183 BLAKE2B 070b19f5bf335924a9dc7933201d0c996d3010254a9c1917c09225bb19913ce8db7416340a47bd402b6b4cb6c51834a364e1563f6c299980f7a429117084500c SHA512 351cc777c76ae9570368816fa6f855af3c01f8767dd491199c258e73127d5dbea5972b9328d017d524438d406835de8874b2e8c1b22a9e9660f86c6ec05eb4d7
+EBUILD go-net-0_pre20180816.ebuild 1498 BLAKE2B c642395af4f3370a6b3c5c0f2f0350a128ce2427c932b60be40ff2c152b8570cabcd1291f05d2f171db1dd14efb1d1cd184643992dc0d1f18af51ef8c0368062 SHA512 280c1b31440ddd5eed77b18465419518251497c03bd82044ab8cb9e6696e6b8069d530327f30e269f29431a103d42acce19ebfb233f0004faaecc3d869d49ae5
+EBUILD go-net-9999.ebuild 1614 BLAKE2B 5b181ec3ac0cdaf1727bce7be573ce092b64c8972b6782cbaa559718b218ffaea2c107946732d12f34aff891082b339ea18f50ebbd0c669b15a29a60f9f3c161 SHA512 0e1ab66f4f4fc977fa3f95b1c20d58c57921d3fe70aa1c7b0f82a3b1efaf14b92610d9e4f7418b6de9630baabc7c03b87b647038954383c1409d0683b32ca21e
 MISC metadata.xml 301 BLAKE2B 842eb1c02738ef2694108db727a2f89137c7c3bb45743df6013f7b5542ee9029df0515680905bb93f628aeae74870b5a3167693c7345ad00ad15dd9920e86286 SHA512 bef6b9d68e27cb70d096a5abeac35df9248998041cb8eb370853e9044d7994b6dc3c32535dac71688d143ae18dd2ca1118fede990101094e724031b042fa71f6
diff --git a/dev-go/go-net/go-net-0_pre20150804.ebuild b/dev-go/go-net/go-net-0_pre20150804.ebuild
deleted file mode 100644
index 44adb09a05e9..000000000000
--- a/dev-go/go-net/go-net-0_pre20150804.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-EGO_PN=golang.org/x/net/...
-EGO_SRC=golang.org/x/net
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="1bc0720082d79ce7ffc6ef6e523d00d46b0dee45"
-	SRC_URI="https://github.com/golang/net/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="Go supplementary network libraries"
-HOMEPAGE="https://godoc.org/golang.org/x/net"
-LICENSE="BSD"
-SLOT="0/${PVR}"
-IUSE=""
-DEPEND="dev-go/go-text:="
-RDEPEND=""
-
-src_prepare() {
-	# disable broken tests
-	sed -e 's:TestReadProppatch(:_\0:' \
-		-i src/${EGO_SRC}/webdav/xml_test.go || die
-	sed -e 's:TestPingGoogle(:_\0:' \
-		-e 's:TestNonPrivilegedPing(:_\0:' \
-		-i src/${EGO_SRC}/icmp/ping_test.go || die
-}
-
-src_compile() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
-	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
-	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
-	export GOROOT="${T}/goroot"
-	golang-build_src_compile
-}
diff --git a/dev-go/go-net/go-net-0_pre20180816.ebuild b/dev-go/go-net/go-net-0_pre20180816.ebuild
new file mode 100644
index 000000000000..6568f4a0837f
--- /dev/null
+++ b/dev-go/go-net/go-net-0_pre20180816.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=golang.org/x/net/...
+EGO_SRC=golang.org/x/net
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="aaf60122140d3fcf75376d319f0554393160eb50"
+	SRC_URI="https://github.com/golang/net/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go supplementary network libraries"
+HOMEPAGE="https://godoc.org/golang.org/x/net"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=">=dev-go/go-crypto-0_pre20180816:=
+	>=dev-go/go-sys-0_pre20180816:=
+	>=dev-go/go-text-0.3.0:="
+RDEPEND=""
+
+src_prepare() {
+	default
+	sed -e 's:TestDiag(:_\0:' \
+		-e 's:TestConcurrentNonPrivilegedListenPacket(:_\0:' \
+		-i src/${EGO_SRC}/icmp/diag_test.go || die
+	sed -e 's:TestConcurrentNonPrivilegedListenPacket(:_\0:' \
+		-i src/${EGO_SRC}/icmp/diag_test.go || die
+	sed -e 's:TestMultipartMessageBodyLen(:_\0:' \
+		-i src/${EGO_SRC}/icmp/multipart_test.go || die
+}
+
+src_compile() {
+	local x
+	mkdir -p "${T}/golibdir/src/golang.org/x" || die
+	for x in sys text crypto; do
+		ln -s "$(get_golibdir_gopath)/src/golang.org/x/${x}" "${T}/golibdir/src/golang.org/x/${x}" || die
+	done
+	env GOPATH="${S}:${T}/golibdir" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_install() {
+	golang_install_pkgs
+}
+
+src_test() {
+	GOPATH="${S}:${T}/golibdir" \
+		go test -v -work -x "${EGO_PN}" || die
+}
diff --git a/dev-go/go-net/go-net-9999.ebuild b/dev-go/go-net/go-net-9999.ebuild
index bf416c447af4..f9b9ae5ffca2 100644
--- a/dev-go/go-net/go-net-9999.ebuild
+++ b/dev-go/go-net/go-net-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-EGO_PN=golang.org/x/net/...
+EAPI=6
 EGO_SRC=golang.org/x/net
+EGO_PN=${EGO_SRC}/...
 
 if [[ ${PV} = *9999* ]]; then
 	inherit golang-vcs
 else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="b6d7b1396ec874c3b00f6c84cd4301a17c56c8ed"
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="aaf60122140d3fcf75376d319f0554393160eb50"
 	SRC_URI="https://github.com/golang/net/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	inherit golang-vcs-snapshot
 fi
@@ -20,24 +20,40 @@ HOMEPAGE="https://godoc.org/golang.org/x/net"
 LICENSE="BSD"
 SLOT="0/${PVR}"
 IUSE=""
-DEPEND="dev-go/go-crypto:=
-	dev-go/go-text:="
+DEPEND=">=dev-go/go-crypto-0_pre20180816:=
+	>=dev-go/go-sys-0_pre20180816:=
+	>=dev-go/go-text-0.3.0:="
 RDEPEND=""
 
 src_prepare() {
-	# disable broken tests
-	sed -e 's:TestReadProppatch(:_\0:' \
-		-i src/${EGO_SRC}/webdav/xml_test.go || die
-	sed -e 's:TestPingGoogle(:_\0:' \
-		-e 's:TestNonPrivilegedPing(:_\0:' \
-		-i src/${EGO_SRC}/icmp/ping_test.go || die
+	default
+	sed -e 's:TestDiag(:_\0:' \
+		-e 's:TestConcurrentNonPrivilegedListenPacket(:_\0:' \
+		-i src/${EGO_SRC}/icmp/diag_test.go || die
+	sed -e 's:TestConcurrentNonPrivilegedListenPacket(:_\0:' \
+		-i src/${EGO_SRC}/icmp/diag_test.go || die
+	sed -e 's:TestMultipartMessageBodyLen(:_\0:' \
+		-i src/${EGO_SRC}/icmp/multipart_test.go || die
 }
 
 src_compile() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
-	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
-	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
-	export GOROOT="${T}/goroot"
-	golang-build_src_compile
+	local x
+	mkdir -p "${T}/golibdir/src/golang.org/x" || die
+	for x in sys text crypto; do
+		ln -s "$(get_golibdir_gopath)/src/golang.org/x/${x}" "${T}/golibdir/src/golang.org/x/${x}" || die
+	done
+	env GOPATH="${S}:${T}/golibdir" GOBIN="${S}/bin" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_test() {
+	GOPATH="${S}:${T}/golibdir" GOBIN="${S}/bin" \
+		go test -v -work -x "${EGO_PN}" || die
+}
+
+src_install() {
+	rm -rf "${S}/src/${EGO_SRC}/.git"* || die
+	golang_install_pkgs
+	exeinto "$(go env GOROOT)/bin"
+	doexe bin/*
 }